some cleaning and removal of inter-dependecies
fixed xtr leaks
fixed control bug previously introduced
changed multicast output also
small fix