a few twinks on the setup