Cosmetic changes.
Implementing a basic viewer.
 removing some cruft.