Bug fixes based on feedback in first use case