Few comment updates