general improvements and new quotes