additional regex improvements
improved report display