Fixed some broken token, added token import helpers
Fixed rights