Some link fixes
Some cleanups of the PEM and EM + adding some internal links