improved fit: now full parameter optimization