Many, many changes

too much to remember