PolishDoughnut: a bit more updates