finished saving state for blocks, for #1575