sevel minor fixes