Added a bunch of block validation