Correcting some stuff and commenting