fixed bugs, changed args handling