a lot of old changes

more stuff to do, less time for it