some line lengths
some changes
mergded