Little Fixes
Cleaning up
More stuff
Little Typo
Style
Merge remote-tracking branch 'origin/develop'