renaming
correcting variable scopes
Merge branch 'master' of https://github.com/danielwhatmuff/skyscape-shutdown