Working on things as I have the time. So many changes, so little brain to keep track of what I have fixed already.
