final tewaks for production