removed ByteSize, etc.
updated block types