Fixed typos and dynamic params