Rewrote map parser and some cleanup.