some fixings !!
!!