misc bugfixes, pushing to production