More tweaks and updates...

Sorry these git commit messages are so useless