add commits to the grammar
add support for callbacks in addition to Promise
fix allPromises code