fix: repair and improve validator