Cross platform again. Fix match count for multiple matches on single line. Fix some match boundaries