Fixes

Small fixes not including elevation features.
Added test and rebased.