Fixed bug in pass2 where overlapping mouse tracks would not be handled
correctly.
Minor other changes