more changes from various suggestions