Modify completion system, general improvements