reorganize options + add --include-node flag
improve cli options and skipNodeInclude