Map Fix

Makes the thing fully compileable. Adjustments and missing things to be
sorted out over the next three days.