Fixed Up Maps and Added Loading