bugfix less noise
bugfix
bug fixes and improvements