fix initial
pm modify
jeff add some we
Merge branch 'beta_1' of github.com:wydevSH/JDA_wy into beta_1