Renammed classes
Improved Magic Blocks and Fixed for SMP
Import fixes
SMP fixes