General clean-up and regression testing.