EDGE++: Improved Training and Sampling of EDGE