Fix whitespace issues and fix maps