Add message counts to available fields. Clean up whitespace. Add extra testing for messages.