edited some stuff a bit