Various changes, working on black line following