Final tweaks before testing.