finalizing some things for initial rollout