Last minute clean up and improvements.