Several minor fixes<br />a couple of new functions