* diagnosing issues * fixed loading states * addressed PR comments * fixed missing symbol issue * fixed merge conflcit * fixed uppercase token symbol issue