UV index conversion - Add missing bits and tidy up.