pad rework
fix
things
Merge branch 'flight_rework'