new lines, fixes