- complete some javaDocs, mark TODOs