Fixed a couple bugs and fixed the Colors on the map not showing up.