comment some more and fix up compilation errors