Changed name handling

Changed name handling to capture non word characters.  Added additional event captures