Resolved map loading issues and reimplemented cipher engine on map loading