work in progress

Pods/VENTokenField/VENTokenField/VENTokenField.m

@@ -319,13 +319,12 @@ static const CGFloat VENTokenFieldDefaultMaxHeight          = 2000.0;//150.0;
         token.didTapTokenBlock = ^{
             [weakSelf didTapToken:weakToken];
         };
-        if (_tokens.count > 1) {
-            [token setTitleText:[NSString stringWithFormat:@"%@,", title]];
-        } else {
+        if (i == [self numberOfTokens] - 1) {
             [token setTitleText:[NSString stringWithFormat:@"%@", title]];
+        } else {
+            [token setTitleText:[NSString stringWithFormat:@"%@,", title]];
         }
         token.colorScheme = [self colorSchemeForTokenAtIndex:i];
-        
         [self.tokens addObject:token];
 
         if (*currentX + token.width <= self.scrollView.contentSize.width) { // token fits in current line
@@ -485,9 +484,7 @@ static const CGFloat VENTokenFieldDefaultMaxHeight          = 2000.0;//150.0;
 - (void)didTapToken:(VENToken *)token
 {
     if (_readOnly) {
-        token.highlighted = YES;
         [self.delegate tokenField:self didTappedTokenTwice:[self.tokens indexOfObject:token]];
-        token.highlighted = NO;
         return;
     }
     VENToken * tempToken = nil;