Fixed and added some moves.