make docs generation work

And other small changes.