corrected some stuff