minor changes (but lots of them)