V1.2 d2 draft for review

Added screen dumps.
Various clean ups and fixes.