Merge pull request #559 from theresaanna/master

Potential fix for 123-4/null
improve def scope
when manipulating the DOM, its often necessary to use the correct class
def scope debugging