Tweaks + added support for items