Adding the unmasking password features and fixing some bugs