edited some things