- Fixed incorrect conformation of protocols specified data source and delegate.
- Fix some protocol naming and calling to conforms more towards Apple convention.