-Fixed more defects