Spoffy's improvements merge