Mainly error-handling and making the program more robust. Likely restructuring of CLI.java into more, specialized, classes.