Updating with a few fixes and features from the original style guide.