last minor fixes