fixed #1 & #2, added options menu