Bugfixing
Fixed small Bugs