Various improvements.