and fixed most of the long lines