fix some details;