made changes based on hamm to do list for 9/18