Update to promises 0.2.1 and improve a bit things