Misc changes to try and make it better... :|