- On single messages use the bare JID for DB querys - Add more debug logging - Some light refactoring