Some performance updates and writing style and consistency updates