getPasswordOrRead fixed, other small improvements