Commands pushed along with a few other changes. Should be fine now and
allow PD to keep developing them.