fix turnarounds and cleanup