fixing up the details