A mess of improvements