fix
rewrote last fix using async.apply
parser refactoring