Changes to Storage to fix base64 encoding, more work on Mailer