make changes from usability list, save a few major ones