Updated BOM, renumbered a few references