Just some more tinkerings