Added more peep_walk. Fixed waving bug