gone through all changes, going back and fixing larger ones