Major bug fixing and rework

Should makes the wands work better and in SMP without crashes now.