- changed and reformated references (also: new tokens)