bugfix and param files clean up