Lots of changes to get rid of gcc warnings/errors
Removed dead code from MapGraphics