Deferred deferreds
Fixed some bugs