some cleanup; fix make tools script