Adress several comments regarding #313

This PR adresses several comments of @chrismayer which he already gave in #313.

Cheers for any reviews.