Just some quick findings of bugs + fixes
Merge branch 'master' of https://github.com/GOGO98901/Platform-X.git