Added some more error checking to map loading
Removed TODOs from tilemap