Update scheduler task update_block_state to allow rechecking a bunch of blocks
Clean up some formatting
Catch a few minor edge cases