Json tweaks and eliminate some Async.waits