More progress and some cleaning.