little cleanup
bugfixes