edited some stuff