Commodity system updates

Updates to commodity mechanics.