Code review.

Added ToDo block comments at code lines / function blocks, which are
unclear, or on which some peer review would be appreciated.