Lots of bug fixes, removed some duplication better input checking. Added
customiseable combo of passwords.