additional fixes and parameters