a bunch of blocks

So here are a few blocks, and some minor but important changes to the infrastructure.