Adjusts salt generation to avoid replacing clay, and more naming of the varibles