bug fixes, changes for 3.4 release

migrated popup to module