Added arginfo support and some other changes.