Updates

- Added checks for items
- InvalidItem checks