Small features

Great work! Just trying to help out in some small ways. The commits are fairly self explanatory.