lots of minor fiddly changy-pangies