Further reduce node copying waste
Merge branch 'master' of github.com:cse-bristol/jasb
Fix some things broken by redesigning locations