Added supply class, fixed spelling issues, etc.