moving main
drawing map, map fixes
merge