added default data values and some code enhancements..