fixed all issues.