disambiguate and tweak spec