Some clean up and fixes

Fix issue where parsing move learn type would fail for level up and egg
Redo of Show impl