OP-984 More refactoring.
OP-984 Fixed a double dispose issue in destructor.
OP-984 Closing in...
OP-984 Minor fixes before actual gui changes.