Changed the argument variables and fixed some other things