Paused twice... closed event takes care of all cases
Adjusted map elements
Merge pull request #102 from jehope/jehCleanup4Feb14

Jeh cleanup4 feb14