cleaned up block delegate a bit, since its probably here to stay after all (mostly naming stuff and sorting)
16 files changed