fix contraposition mess, cleanup of parameters etc.