shuffle list!
minor changes