Bug fixes begin