more changes from Davis
5 files changed