fixed flight-bug
removed some code-smells
improved code-quality