few tested corrections and updates to salt