Mostly fixed issue of the casing of the output strings.
KNow big bugs exist will fix in next commit.