fixing more errors