Cleanup changes

Cleaning up after ourselves on disposing of objects, additonal logging