Added passing keywords on the command line, added new command options, fixed natural sorting and a few other minor tweaks