Final tweaks

Final tweaks for 1.2 before branching for experimental new fun stuff.