Changes to generators, fix the block states list