Update to add comments and fixed likes