Corrected and added some labels