Added better altitude calculation