Fixes

Small fixes not including elevation features.
The first element is repeated, right? For sake of clearer code I'd say to go with the repeated element.