Add comments, fix default click behavior, and fix +1 bug