corrections in light of @lukebakken and @coderoshi comments