Correct error in computing v from xi.
Ensure second scale calculations are not printed unless printing all
scales is requested.
Fix minor bugs.