fixed map
did some thangs
I'm hungry
handicap
fixed merge conflicts hopefully