fixes #21, fixes #13, fixes #37
Merge pull request #64 from LegoStormtroopr/popups

fixes #21, fixes #13, fixes #37