fixes in testing version