Just map fixes + workfile

Nothing new to see here