Fixed blocks

-WARNING: It's like 2 in the morning, don't expect things to work.