Update to production; various fixes