Final fixes. Satisfied with the results of our bug fixes.