more promises goodness
some comments added