Removing debug stuff, fixing adding in the args