cleanup
bugfix
status messages