Fix'd GameMode.java issue + code changes
Fix'd GameMode.java issues + code changes