Today's fixes
Fixes to indexing, new messaging module