Jbau jan2 fixes

several p0 fixes.  see commits