further fixed long lines