minor fiddling, mostly