Made small changes, added bom data