major cleanup
current part 1: issue with running first map