Address Milan's comment
more comments and a build fix DONTBUILD