fixes and token implemented
fixes and token implemented