lost of minor fixes changes