fixed more errors and whitespaces