Feature/improve apis

Some improvements to comment apis.