Add a few parameters. (incorporates and closes #15)