Fix password field and update DocBlock
Major cleanup