more cleanup
small map server fixes