Final Tweaks

Also added BOM