Changes to some spelling and container