Another final commit

Considered all suggestions Markus gave me.