Reworked items and small cleanup