progress towards bug fixes