Add command-line options, GUI is more-or-less done