Minor fiddling and tweaking