clean up and user info update bug