Add windows to buildings, fix index