clean and bugfix