small changes
Merge branch 'mapBranch' of https://github.com/Nirespire/Rogo into mapBranch
commented out errors (for now)