Made slight tweaks to setup.