testing updates and bug fixes