Fix steering bug; some more cleanup.