bug fixes on user