tunnel: cosmetic changes