Added Prefix Magic + Fixes