Tweaks on Converter and Event Handling done