Milestone1, cleanups, regression testing