Build scripts all:  Add manufacturer and general cleanup