Fixes comment collection dispaly bug and some other little tweaks.