Added some info about the block amount in use
Restored one merge test lost in previous rebase with master