touched up a bunch of little stuff and started tweaking main to run with the other map (in main_with_my_map)