Bug fixes + NSString