A few missed areas and start of the Map port.

I'd have just made a new branch, but apparently Github hates me until I
push what I got.