+ Recovey password
+ Added handling exceptions in some places
+ Other small changes