Makefile improvements
do a better job saving registers around tracing