bug fixes to user