Updated BOM and other minor modifications