cleaned up comments and removed cruft
add thingtracker