changed map size
WIP
merge conflict fixed
merge conflict fixes
font formatting -- 1em rather than px