Some more fiddling, unsecessful mostly