Several internal improvements.