Fixes

Small fixes not including elevation features.
Ok, done.