Tweaks to items and units

Tweaks to items and units