Cleaned up --help code, partially implemented --version