Several Updates

Make everything a bit nicer. Add message grouping.