todos added; license update (better text)