A few changes to make blocks better