at least some minor fixes