Bug fixes and more delaying ...