made a few needed changes and made sample data a little better