ref #70 missing some merge fixes