cleanup and work on tokens,