Add pubs, Fix some problems with air in building