Link to item class instead of item.
Fixing more bugs.