Added more information and did some clean up.