cleanup of leaning toothpicks (as much as possible, anyway)

see also comments on #199