some small fixes to user