Lots of changes

Multiple changes need to be merged to keep things current.