fixed crappy scoping/json stuff
added quick dirty modal test
Merge branch 'tjs'