more fixes from kain88-de comments