Tweaks

Changes made to clean things up, and also to reflect valuable feedback
from the presentation. Will update again after I am back at work and
can test against AD.