couple of comment changes
moved to-dos and put them in tracker instead