Improved logging, and fixed comments for multiple classes.