Added settings and some comments
More tidy up
Added a test for dispose