lots of bug fixes for tracker, added directory checking to tracker, added suggestion to fixes to tracker
merge conflicts fix