Remove some comments and fix an error with tag