some more changes

what is in red was deleted