Add ItemBase and BlockBase. Redo some comments