Fix some comments.
Factor out inventory stuff.