mostly harmless

mostly merging, also moved some things about.