Fix up the password encryption and also adding in more of the archive stores