minor cleanup
blocks are objects now