Final fixes to get map displaying. Good teamwork for the win