Fix blocks. Apparentally the last commit messed "some" things up.
Some minor cleanup