New Option menu; Lots of Improvement; Bug fix