A number of improvements and changes
A number of improvements and changes