fixed stuff / reorganize / StateManager / multiple item inventory