Upgraded some of the categories, added NSString