Minor BOM tweaks

Minor BOM tweaks updated current as of 10/6
More BOM tweaks