bomb and final updates for first cut.  lots to clean up still