review comments added as TODO-notes