Master

More fixes + more magic effects.