lots of changes

too many to list.