Modified showpwd methods, also little clean and fixes