add pubs; improve spacing