final fixes before testing