Changed some method calls freom & to self-> which is the way it should be, comments and a few more die to _die switches