Monday's commit. Some Bodegas bugfixes.