Fixed typos and the Swipe/Tackle referencs for the first move
Merged in rewrite branch and fixed in game strings.