more work on the warmth page and some general tidying up/