added Token
several Fixes