final touches and testing