Daniel d3 fixes

Red border left in to aid testing.