Fixed bugs with changing moves and cleaned up switching between pokes.