Bugs solved, custom items now managed
Final bugs corrected for custom items, go to v2.2