Token fixes

Begin arcbot message
This merge request is automatically copied from !1417 (merged) orginally made by @aleksandr.konstantinov
End arcbot message

Adding token control to arc tools. Some fixes to token processing.