extra logging, fixed comments