Fixes and misc

No rush to merge, whenever you get a chance.

There aren't to many changes, I'll just keep adding to this pull request for now.