Bug fix for quest items
A few more updates