lots of changes, see diff.txt