Fixed casing and other issues.