polishing the last few commits