some reversions and commenting