final touch up changes along with testing.