Some more updates, trying to fix linefeed