fixed many issues.