secondary_right handling now working properly; 462 of 465 tests passing.