Fix some comment and bug