Added in some more items, polished a few things

Still debugging. Running into null pointers when I try to get the name
of an Effect.