bugfixes, added options menu