bugfix

more little fixes