- added comments
- fixed bugs in 'Edit User' screen