More comments, still things to be done