Minor fixes implemented before demo.
Merge pull request #46 from vcnickerson/Ian/active

Minor fixes implemented before demo.