Further tweaks to metadata for Buildings and Electricity. #40 #50