A bit more logging and comments