minor fixes and map tweaks
removed unnneeded plural parameter
Merge pull request #1 from morgajel/develop

from you to me I think