fixed other issues.