Cleanup and comments

a whole bunch of rearranging and things in MapPanel