fix changes from feedback