fixed cross linking of event listeners etc