tweaks and debug dialog directive attempt
Merge pull request #579 from protherj/demo-sprint-10

Demo sprint 10