some fixings and addings