Fixes

Small fixes not including elevation features.
> This oneliner made both output consistent and writing test cases less disturbing.

Is there a test covering this?