add password options to commandline
refactor commandline