Many tweaks, mostly to enable Morphic 3