Some changes to remove too long lines etc.