Added some details and improvements.