adding maps
oop
fixes