Add block setting and clean up methods a little.