improved kit validation