Fixed map events

Adjusted a few variables and added a lowercase version of the extension.
Merge pull request #16 from bozdoz/master

Map events and variable adjustments