Portals list nom energy, bugs, nits

Code review will need to look at the individual commits as I fixed the indentation in one of them.

Addresses: #171

Commit descriptions should give the rest of the needed info