Added support for various function arguments

Also, renamed to target.js