Various tweaks readying for production.