some improvements from 2005-06-05 07:32 which where not commited (hopefully a little better parametar handling)