Some more comments and minor refinement [1281]