moved some stuff out of setup to more general config...