added captions, added tag adding/removing