bugfix,refactoring etc.