Added load and did some tidying.