General touchup

Fixed a few method names, added some reprs (which may or may not be
useful, i'm not sure), changed the pokemon lineup a bit, a few other
things