refactoring code
Merge branch 'troops' of https://github.com/KopiSusu/Globe into troops
Merge branch 'troops' of https://github.com/KopiSusu/Globe into troops
more merge
fixed merge issues, fixed errors