A slew of improvements