Removing unnecessary params
Fixing some param names
Merge branch 'development'