added some TODO's, comments/documentation