bom-ex enhancements and corrected renumber