Added pst extraction of attachments.
Cleaned up some small issues.