Add --coverage option to command line, more various fixes to get line mapping working better.