Minor bug fixes and menu additions.

Fixed some minor bugs and added some items to the menu.