More small changes (incl debug on PB6).