Added some fixes, Just need to throw in some battle music.