Made a bunch of fixes on parameters