Updating some demo stuff.
Bunch of changes from another style guide meeting.