a few more small changes, can be diffed