697 Show properties and headers.
Tweak a few things