Fix click in same line, add comment, more API functions