add 'and' tag, update gitignore, make manual labeling more convenient