Cleanup and notes

Some cleanup done.  Left note for the biggest thing to be done (allow
EntityWolf->AdvancedWolf conversion on item-use).