fixed issues that arose during final testing with TA