* removed CustomDataSource.
* some portability improvements.