Topic/comment fixup

had to include matts latest PR to be able to run app.  Happy to rebase once that is merged.