Minor bug fixes; added popup menu.