lucky someone wrote very readable sourcecode so these fixes were a diddl...

Fixes the issue I raised earlier