work:corrected spacing and validation issues