Improved some details