Updated most of the block stuff

- Arrgh missing @Override annotations