bugfixes
little cleanup
Bugfix