Args generation added, some bugs fixed