Made more things IDisposable.
Ensured dispose is being called.
More dispose stuff.