some fixings done