more nits fixed