Final Tweaks cont'd

Cleaning more cruft to present demo.