Minor changes and a few lines of code in the main method.