merge recent changes, prep for plc-0.2-9