There was a big bug. The bug is no more. Also tidied up stuff.