minor production tweaks & testing