Finished map and bug fixing