Fixed some minor TODO's + minor documentation updates.