Incorporated new Builds tags;  various other fixes