added some maps
merged a few things