final fixes before splitting