Added options menu, shortcuts, bug fixes, etc.