-More cleanup...nothing major other than plumbing and de-uglifying.