fixing up some details