improving some details