Fixes

Fixed one's ability to supply password on the command line, facilitates future automation. Also ammended the help text to make things a tad less confusing.