JC-1740 Fixes after code review. Added comments. Fixed saving user contacts.