More fixes

Mainly Block/Item id fixes anywhere but in the Item classes