minor code chore
code chore
code chore
optimize block save and load
code chore
code chore