A number of improvements