Event tooltips and more breaking up files