fixed validator bugs