Added property display logic.

Various cleanups.