Corrected a few Thing