Remove linebreaks from import, and some other fixes.