tested - General updates to work better with the salt update