Added Args.js support
Bug fixes and clean up
Added helper functions