Added even more command-line options and now reading files.