addressed some TODO's, added some conclusions, misc