added output for user name
added TODO and a minor formatting tweak
added command line parameters and updatd variable names throughout