minor fixes before production