Fix NIBs and prefer NSString to c strings
Update incnlude