Milestone1, cleanups, doing regression testing