Some docs and comments corrections