Improved crowbar BOM and formatting changes