Fixed and edited some stuff