more work on await
await handlers now work with any arity
add TODO comments
update TODOs
tweaks, TODOs
refactoring transfer funcs (WIP)
refactoring transfer funcs (WIP)...
refactor contd
refactor await handler