minor clean up and perf tweak, and reconcile code and paper
ran Linux64 tests
Merge branch 'develop' into mcjit