Adding comments api with some other fixes.