Update, tweaked a few things and added command line params.