More fiddling

Extra bits added! And tweaked.