testing data added, a few bugs fixed