more line length fixes