Fix up some more variable things, hide some blocks that don't work.