added data set
updated with more fixes/enhancements