Bulding types, architecture technology and research lab added, rewrites on base templates