Phantoms managment + several improvements