Merge pull request #567 from mcmonkey4eva/master

Pull request for fixes and updates
Merge pull request #568 from mcmonkey4eva/master

More fixes
Fix incorrect debugging

DebugElement was being used improperly.