Validator simplified and week number bug fixed