fixed newline chars and new class definitions