Updates
Host of updates, sorting and cleanups
Adding files/msg info
Updates
Merge pull request #1 from christophwarner/master

reclaim last few commits on Christopher's fork into institutional