bug fixes, added popup menu
bug fixes
bug fixes