Misc things

Just some miscellaneous things. If you want me to discard any specific changes just tell me and I can drop them.