Small fixes.
Update linebreaks
Merged