Added more cellular blocks, cut some debug stuff