Dispose converter.
Fixed event handler
Complete but untested.