correct and tidy up regexes
Added nick and quit detection, removed old comments