switch from promising to bluebird
fix typo
revert change were we are unsure how it works