testing and fixes