extended testing and fixes