minor fixes all over