Fixed newline issues. Additional performance gains.