CYB-367 - Fixed up commenting and liking