some fixes
Adding Yargs. And fixing asyncronous issue.