some more refactoring
remove popup
Merge pull request #72 from marsmith/master

some updates