Fixed options bug, added some new features