More model refinements

Stock, reorder, etc.