Bugfix PG & E-Relation

Closes #4
Closes #5