fix hi/lo bug, trace pass
Merge branch 'trace': fix hi/lo bug, trace pass

Conflicts:
	core/Makefile