Fixes
Change done(fn) to then(fn).done()
Cleanup