Fixed duplicate name and missing arg bugs, seems to work