misc changes in parameter handling.