Fixed newline issues
More David stuff