Various Changes

Feel free to merge or not whichever of these changes you'd like, at the moment they're mostly ease of use for me.