Add watched tags and assorted bug fixes