Minor polishing
finishing user updates