various rejigs
fix some conflicts