Added debug flying
Some more reformatting