fixed filling, fixed some blocks