new version
Merge branch 'isolate-core'
a few quick updates
fix conflicts