Fixed a little issue with a few more arguments.