1.7.2 and SMP

Finished updates for 1.7.2 and finished SMP Compatibilituy