applied minor fixes