Corrected more errors