FIXED SEVERAL ISSUES.