More tidying up of the code<br />Changed the way events are handled.