fix user side bugs
bugs