more improvements to user