several bug fix & privacy switch