Corrected a lot of bad mistakes