some minor fixes...