add stricter command checks