Hopefully fix Gather
Fix some upgrade messaging
Some fixes to enchanting