bunch o smallfixes
changelog
Merge pull request #2014 from DeityLink/bunchofix

Bunch of small fixes