a little cleannup
resolved some 'flicts