ver-1.8.4

fixed some bugs