fixed small bugs and added more order samples