Added hive sub-blocks, tweaked hive generation