bug fixes and more extensive testing capabilities