many bug fixes
production push