fix deep context stack and global stack 'this' pointer issue
undo formatting changes for cleaner git pull