Some fixes and updates to BOM.
Added some notes.