bug fixes and testing progress