add IDisposable mixin
comment fix