more little fixes ...
and again