Various internal improvements