tweaks and fixes pre production test + bump