a few tweaks, and a skeleton of to_lorry