some andjustments
bug fixed