More Options

More Options and some bugfixes
removing some unused code