Improved comments and console output a little.