adding SALT to temp pw; some minor cleanup