some more changes, etc.