Several internal improvements