Addressed Zhorken's myriad comments on the item rewrite so far. #247