Fix #2 Manage wave more efficiently to control service calls
Quality andjavadoc improvments