Profiles for testing and production, some minor fixes
Profiles for testing and production, some minor fixes