Changed elevation to ElevationLayer
Fixed some pointer issues + direction of map construction