Fixed paswword checking, bit of code cleaning & comments