Cleaned up some int -> NSUInteger warnings
fixed some spelling errors
reverted some files to old