DoneIt: Looooooots more work. General tidy ups and bug fixes.