bugs - improve unit handling and make tag/link add/delete work right