comment api and fixes