Items and a few bug fixes