A lot of fixes + new Future class