Put in one last fix for the lhs and rhs to allow composition, cleaned
out logging and various mess, so this is the last clean checkin before I
merge to master and we are in the home stretch to release