Added dispose functions for cleanups ... should work this way.