cleaning up tokens install
bugfix to rest/observbles