added and, or, and support for commandline args, also removed cruft in target.py