More comments & better map names for #88