Fixed and re-arranged a few things
Merge remote-tracking branch 'origin/master'