fixes, better regexp, titles and more matches.