much minor fixes