fix param names and defaults