added an aoe, this should cover magic, played around with and fixed some other stuff.
resolving conflicts