Added comments.
Changed error output to use 'raise'.
Modified formatting of help output.