????
Fixed makearg() bugs

Thanks Ben for getting this all figured out with me.
Merge branch 'wtf' into develop
Formatting and commenting