Improve some details