Minor Bugfixes

TODO: Make effects having an ID like buffs