More documentation
Less verbose output of various classes