fixed some new issues.