tokens, removing display: table, various and sundry