Updates

Some tidying.