Fixes

Small fixes not including elevation features.
Why is this code removed?