comments on todos and minor edits