minor tweaks, still pretty much "production version 2"