Map Errors Fixed, not Tested