make all obvious changes, testing still underway