More map shit. Getting there.
Fixes some of those errors.