Added DataTools and minor bug fixes.