changed: some things and; added: other things