cleaned promise handling
fix typos