Another chunk of improvements