Some more progress and useless commit comments.