removed more errors and formating