more bugs in expanding blocks logic