Fixes
Loads of fixes from lack of sleep
Merge origin/Square