several small additions to the setup.