tidying packages, minor tweakage