Fixed and added more pokeinfo functions