Added number-of-messages counter
Added some more stuff to ignore