more varz
fix review feedback