add gateway notes, tooltips and better labels