Tidying up, fixing odds and ends. Improving things.