more improvements. Ghost adder mostly in