Slightly more verbose logging and more comments