Cleaned up params, removed deprecated ones, corrected param names.