Fixed bug in token; repaired code for identifiers in Entity, added test for identifiers in Citation