Small progress in various places.