makefile better, track mode tested, needs improvement